Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pebble Rebased #124

Merged
merged 17 commits into from
Oct 12, 2023
Merged

Pebble Rebased #124

merged 17 commits into from
Oct 12, 2023

Conversation

Carolyn3114
Copy link
Contributor

@Carolyn3114 Carolyn3114 commented Oct 7, 2023

About the PR

Rebases pebble, with all the goodies ( I Think)

Why / Balance

Lowpop map

Technical details

peble

Media

Pebble-0

PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
Small fixes/refactors are exempt.
Any media may be used in SS14 progres
s reports, with clear credit given.

If you're unsure whether your PR will require media, ask a maintainer.

Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
-->

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 7, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 7, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 7, 2023
@Carolyn3114 Carolyn3114 changed the title Peblerework Pebble Rework Oct 7, 2023
@Carolyn3114 Carolyn3114 changed the title Pebble Rework Pebble Rebased Oct 7, 2023
@Colin-Tel
Copy link
Contributor

My cursory observations/requests:

remove firelocks on top of maint hatches
make EVA room not HoP locked (opt for command or something)
HoL fax machine labelled "Quartermaster"
Mantis has detective door
Mantis gets his own fire alarm to lock himself in his room lol
Get rid of autolathe in Epi
Give Epi reverse-engineering machine
Atmos should be set up at least with a basic O2/N2 mixer. It is a small-pop map after all

@Carolyn3114
Copy link
Contributor Author

My cursory observations/requests:

remove firelocks on top of maint hatches
make EVA room not HoP locked (opt for command or something)
HoL fax machine labelled "Quartermaster"
Mantis has detective door
Mantis gets his own fire alarm to lock himself in his room lol
Get rid of autolathe in Epi
Give Epi reverse-engineering machine
Atmos should be set up at least with a basic O2/N2 mixer. It is a small-pop map after all

why remove the autolathe in science?

@Carolyn3114
Copy link
Contributor Author

thar

@Plyushsune
Copy link
Contributor

My cursory observations/requests:

remove firelocks on top of maint hatches
make EVA room not HoP locked (opt for command or something)
HoL fax machine labelled "Quartermaster"
Mantis has detective door
Mantis gets his own fire alarm to lock himself in his room lol
Get rid of autolathe in Epi
Give Epi reverse-engineering machine
Atmos should be set up at least with a basic O2/N2 mixer. It is a small-pop map after all

why remove the autolathe in science?

Because they want people to rely on other departments

@Plyushsune
Copy link
Contributor

Just leave a tool box for them

@Plyushsune
Copy link
Contributor

Also give them their mass media thing

@Carolyn3114
Copy link
Contributor Author

where's the reporter's room?

@Plyushsune
Copy link
Contributor

where's the reporter's room?

Fun fact, there isn't

@Carolyn3114
Copy link
Contributor Author

where's the reporter's room?

Fun fact, there isn't

then they won't get a mass media console

@Carolyn3114
Copy link
Contributor Author

I think this is in a pretty good condition now

@IamVelcroboy
Copy link
Member

tests failing because missing text here
image

@IamVelcroboy
Copy link
Member

  • Remove the DAWS
  • Reason for 2 salvage magnets/mass scanners?
  • Mapper;s choice but you can use the lockers with harduits in them instead of lockers and hardsuit storage. For a small map like this might be nice. But your call.

There's a couple places with double walls. Maybe always been there but, could/should be removed.
image
image

I would say it otherwise looks good.

@Carolyn3114
Copy link
Contributor Author

  • Remove the DAWS
  • Reason for 2 salvage magnets/mass scanners?
  • Mapper;s choice but you can use the lockers with harduits in them instead of lockers and hardsuit storage. For a small map like this might be nice. But your call.

There's a couple places with double walls. Maybe always been there but, could/should be removed. image image

I would say it otherwise looks good.

didn't catch the magnets and mass scanners, I'm pretty sure the double walls have been there, but I can remove them/replace them

@Carolyn3114
Copy link
Contributor Author

fixed

@Colin-Tel
Copy link
Contributor

@IamVelcroboy Let me know when this is ready to merge.

@IamVelcroboy
Copy link
Member

1 more thing I just noticed is this glass over the rock right here
image

Otherwise, It's good.

@Carolyn3114
Copy link
Contributor Author

1 more thing I just noticed is this glass over the rock right here image

Otherwise, It's good.

it's been like that, didn't touch it

@IamVelcroboy
Copy link
Member

I kinda figured. I just noticed it though. Seems odd. 🤷

@Plyushsune
Copy link
Contributor

Once this gets merged i might start working on rock station

@Colin-Tel
Copy link
Contributor

Did this get ninja bombing objectives / nav beacons added?

@Carolyn3114
Copy link
Contributor Author

done

@Colin-Tel
Copy link
Contributor

I'll merge this after I take a look at it in-game real quick.

@Colin-Tel
Copy link
Contributor

image
Looks like the map won't load.

@Carolyn3114
Copy link
Contributor Author

image Looks like the map won't load.

the PR has the pebble file in it, and the prototype seem to work fine, I wonder what's happening?

@Colin-Tel
Copy link
Contributor

the PR has the pebble file in it, and the prototype seem to work fine, I wonder what's happening?

The error I sent references a line and column where the problem is.

image
lol I think I found it

@Carolyn3114
Copy link
Contributor Author

the PR has the pebble file in it, and the prototype seem to work fine, I wonder what's happening?

The error I sent references a line and column where the problem is.

image lol I think I found it

damn it

@Carolyn3114
Copy link
Contributor Author

image I can't find it

@Colin-Tel
Copy link
Contributor

wtf lol nevermind I didn't pull the newest one

@Colin-Tel
Copy link
Contributor

image
There's no tiny fans on the cargo dock.

@Colin-Tel
Copy link
Contributor

image
this button isn't linked to the 4th door (like it matters that much)

@Carolyn3114
Copy link
Contributor Author

got em

Made Pebble the small-pop map
@Colin-Tel
Copy link
Contributor

Adjusted the min population of Edge in this PR because it was 0. It is now 15.

@Colin-Tel Colin-Tel enabled auto-merge (squash) October 12, 2023 15:31
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Velcro said it's okay plus I checked it, so we mergin

@Colin-Tel Colin-Tel merged commit db7842a into DeltaV-Station:master Oct 12, 2023
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
## Mirror of PR #25819: [Fix chromite chasm
sprite](space-wizards/space-station-14#25819)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `2a5be69898b8a0f3750c860e69cce1c819518af2`

PR opened by <img
src="https://avatars.githubusercontent.com/u/62609550?v=4"
width="16"/><a href="https://github.com/Ko4ergaPunk"> Ko4ergaPunk</a> at
2024-03-04 01:30:44 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-08 23:48:03 UTC

---

PR changed 20 files with 0 additions and 0 deletions.

The PR had the following labels:
- No C#
- Changes: Sprites
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> Nothing personal, Ed.
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
![chromite](https://github.com/space-wizards/space-station-14/assets/62609550/0fbdf7eb-d682-4f0e-afaa-cd7e400bdfdb)
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> 
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 


</details>

Co-authored-by: Ko4ergaPunk <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 11, 2025
# Description

Re-adds CMO Turtleneck to the loadout (I swear to fucking god if I have
to re-add it again I am going to commit many war crimes)

---

# TODO

- [x] turtle neck 👍

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: CMO Turtleneck back to loadout
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants